Coachella is nearly here and, if you were one of the many who spent a ton of time waiting around for your Uber drier to pick you up at the Empire Polo Club last year, you will be glad to know that there is going to be a big change this year.

This year, the Uber lot is being converted to a first-come, first-served system rather than making you wait for a particular driver, reports the Desert Sun. The system should more closely resemble a taxi line at the airport or in Vegas.

The Coachella website notes that a coordianted taxi and Uber stand will operate Friday through Sunday, from 9am – 3am, at Ave. 49 and Monroe during each weekend of the festival – with attendees taking the yellow path in and out of the festival grounds.

If you are interested in driving for Uber during the fest (or anytime) you can get more info here. (affiliate link)