7421 sync client

updated as suggested