Initial pass at more selective assembly.