commented stuff out for speed