making it pretty
merging