awaiting controller fixes