merge in new stuff