changes
calculations done
merging