The pieces are correct now (Controller)