switch updated implementation for old implementation