Uber will now let riders tip drivers, addressing one of the most contentious features of its app amid turmoil within the company. The ride-hailing start-up said Tuesday it would email drivers a 180-day plan to make driving “more flexible and less stressful.” One of those features is tipping. Riders in Seattle, Minneapolis and Houston will have the option as of Tuesday, the rest of the country will follow by the end of July, Uber said.

Other changes include paying drivers if their rider cancels after two minutes or more, and paying drivers who have to wait more than two minutes for their rider.