new decorators, finally fixes #7