added emily's changes