Made a lot of changes to deconflict current codes with post-acceptance codes