Correct promises before connection, better queue