question 1, also removed old files