Completion Block is now called in every case