Improve dup pattern