remove this and finalize the controller