Updated to work on clients server