merged #11 & data remapped to latest server code