Updated build with new controls code