production tweaks
merging