Updated for Final Release