missed a couple spots with location awareness