Modifying whereabouts to work in new GATD style