Made some corrections and added a couple more scenarios.