Added my name: Sharmaine on #1
merged Matthew's and Sharmaine's lines