working hopefully
merge