Some refactoring. Double request system fail  was repaired