updated controllers, and model placement