Engine

Method1 + Method2 improvements