client stuff
fixed merge