make the malarkey more future-friendly