Remove old implementation
Inserted the new implementation