Changed evaluate a bit