Add retry process and comment out debug messages