Simplified edit. Added Decorator