Vinay | Reduce one step in the process. Make OPD default when entering the sample source