more updates (hopefully the last)