Doherty unveils new energy plan