Updated for final version