Energy cutoff implemented

Please pull into upstream