updated thoughts
merged