Updates for 6.1