even further optimizaitons...