engine accept decorators too
fix problems with the engine