Merged Arthur's changes
Merged Arthur's changes