Final update ready for public push