ongoing edits (WIP)