Final commit, submitted as is