Updated to include master controller