Events now take into account location