new decorators, finally fixes #2