fixed stage 2 of the project with one issue that last client remained a zombie