didn't replace some stuff correctly