made changes to use AKA annotation instead of matching on location.