Added more rollback to lookahead heuristic