Finishing logic for FEND-805