Make nicer (at the cost of a little speed)