Added the last minute changes. They were not commited on 11th. Commiting now.