removing e.origin check