Changed dependency on draw instrument
Introduced preliminary selection instrument