smgm stuff
merges