WIP add todo for possible performance improvement