Continued work on client side