What about turning it into a decorator?