adding Satoshi edits