some commented out merging attempts