Updated choose class