proposal 2 and other changes