moving to decorators - adding body handling