reinit
merging
better
changes