Added more Close functions
Merge remote-tracking branch 'origin/Matthew-Copy' into master-copy_mason