Merging richard changes