fixed logic stuff