updated on Feathers 1.1