updated setup
merge