changed rules for decorators