Modified gifwhack persistance and added deal with it