Support for energy shifts, G file stuff changed