moved client to controller