Committing final changes, this version is in production