+ Change private members to have separate energy and time