Modified controller again