How it should have been done, again