add fast version back with ability to switch