Added Special Find Locations
FIXED MERGE CONFLICTS