Minor changes with @NayeemaC