Decorator ammended