Reworked completion scenario