Updated to 1.0 Final