client code final commit