update for final version