#8 Controller implementation