Improve select device sequence