before changing the structure of Controller and commands