More logic updates.