working on engine integration