just modifying some cut-paste stuff