Rewrite part not requiring numbers.
OMG SO MANY NUMBERS.
Merge pull request #138 from dmpro2014/more-energy

More energy