Changed rescue's a bit