Re-jig features a teeny bit