need to check query 2 and connection time outs