Made a few changes to answer for Q1