Second Stage changes for 30