ant0ine rest version 2 changes (still more to be done)