add a bit of efficiency
add a bit of efficiency