merging from mleibman