Replacing with the working one