decorators and other changes