fix modal bug, add energy consumption