[WIP] advances to fix