client validation
fixed merges
merging latest changes