Updated strings and names to fit the assignment