changed to final version