further enhancements added, still issue energy scr data.