Minor changes by Brian