add SOS support, deletion handling