Updated with Energy Distribution calculations