pre-merging for some serious changes