Improved reliability and added timeout