fully restructured the engine to v.02