[IMP] start improve server side code.