changes by David Y