Changed a little bit in the view and controller