adjusted waiting to use waitModel