smaller changes
merging functions