*Removed redundant code. *Optimized for server performance.
fixed compilation error
corrected version mismatch
