fig fix.
stuff
merge