First step selection works now