refactored agda locater