Updated server 2 code and refactored