Merging in Andrew's changes from dummy.