Updating logic more.