more changes, no breaks