changes by Morgan's review