Tried to improve Performance and customized some code for our Server