syncing fnal and nwu
some stupid merge