changed controller side flow