Better controller for client