Added more code to check for progress