Adding some comments and an additional scenario