cleaned up - forked in code and paper