merged with new stuff