updated thoughts
merge