Make it NSquare slightly more efficient