getting ready for merging