Committing the working code