Stop waiting implicitly
Make it work with newer company system