Remove sleep and add OSS selector