Updated for version 1.0 Final