I would also move it back to where `groupData` was.