added some custom waits