switch to copy of original
revamping