Revert "Revert "Ready for submission""

This reverts commit 683da6d0cfeea250e83b46029f98bf4ff6dfca23.