changes done by sam
changes from Sam