I've added in the new solar data and cleaned up the bake slightly, pic related