Added full replacement