Removed all setTimeout, now onSuccess based