Added the solution for server