Updated to 6.07 BETA