Engine improvement

Original message was deleted