revised stuff
merge