is it possible to move this to decorator?