#1 more updates from reviews