Updated for final release