8/8 more updates