more changes for replacing