added back things that were lost in merge conflict