Added string replacement in two ways!!