updated for final version