Plugin both servers completed
Merge Anup's code