WIP for improving plot speed