#52 adjust final version