[skip ci] WIP: getting better