Julie's changes
fixing merge conflicts