Added factor part into replacement methods