Code replacement seems to work