Replacing deprecated finish method. New method uses block and is not blocking.