improved Algorithm wrapper system