Merged changes from Anne