last minute logic change