Removed request saving and works slightly better