new stuff
fixed up merge