updated changes to decorator