Update to 6.04
Update