Pushed 6.0 updates