Added better plot selection