Latest changes came after first client deployment