New energy diag

by Garry