made some changes, may have to revert since paper is unclear