Changes to client task