component controllers added (cruz version + changes)