more updates to fix308