Updated for more general location