fixing up client