more updates to fix