Added possible logic for graphing