Commiting scenario 7 & 8 with minimal changes to sprint1 scripts