Added a timeout of 15sec