Added loading on wait