Change ee function to not keep own copy of controller