merge with final version