Any specific reason for this logic change?