added a replacement handler