reworking ordering of work in client