add changes from Amy