Basic events for Energy & fixes