merged other stuff