new Client Code - could do with being quicker