modified the decorators slightly to be more appropriate for the situation