Updated completion blocks