Switch to latest implementation