Working on company controller