merged for the most part