make it (mostly) work