trying to merge controllers