more changes to fix