Further updates for 920180