Better results, remove special cases