changes done during nvmworkshop submission
merge