feature parity for token loader usage

not entirely sure this does anything different