update energielayers

Ready to merge!