Updated Question 1

Remade the whole thing