update method reworked
conflicts resolved, EngineController added