debug statements modified
merged clientbranch