Add Fix and Remove