Add WAITNAO