major change to the final version