Feature/reconnect