Adapted and tested for energon2