Merged Mike's changes in