Further updates to add multiple graph channels - UNTESTED!