Long Overdue Overhaul for Energy Sector