reduced code size - server side only now