Small improvement in speed