Bringing in emily's changes