merged newest stuff