Added plotting and bright_select changes