Updated messaging in the Client and fixed logic for Unit1