and please check where you can do the similar replacement in the code below.