prepare for next version
fixt merging and added some speeeed