work on on the rider where and wait controllers and views