Fixed implemented functions to evaluate properly