Reworked complete status