Updated ShotLocationVisitor code