Include firststart and fixed logic