sangajala-added more wait steps and fixed the duplicate upload