final commit, added client