added whocontroller checks on location