Merging Danny's changes