Remove recording wait, works better