Updated replace design