Made changes based on jerith's review