further editing according to Megan's comments