changed the structure od the engine a bit