forked and inserted updates also includes all stuff from rcurtis also