update future thoughts/resoom
merge