Work on new Energy system