Added check on completed items