Quick tweak to add energy initialization