Improvement to make the space evaluation quicker