manually putting in Julie's changes