Further controller work