Committing the original version as is