[skip ci] WIP: ok, slightly better