Update Caroline's branch

Adding Philip's changes to my current branch for testing.