add a bit of efficiency