Simpilfy and recheck status each request