Update logic from master.