Update for Vote 3 of the changes

Ready for the 4 week rule!