changes for final version