! Remove deadlock, change dialog API