More reworking (eating my own dogfood)