WIP: minor abstract edit