tmp stuff
more tmp merging