several changes and new controller