updates for 6.0