calculations added
merges done