Erics changes before day 2 work
Fixed merge conflicts