Added streamlined no marking version. This did not improve speed at all, but it is cleaner looking.