Improved Location Recognition (-bugs)