final 1.0
merging