Fixing and adding waits