Updated to 1.01 Final