Move timeouts, add node selection