Charlie's changes
Merged changes