Removed check on empty or not before getting; need to add that to location