Updates after Mark's feedback
Fixed conflicts to pull from origin