#1 more updates