PSub | Replacing intelligent plotting logic with simpler manual plotting