Redesigned hyd_engine a bit