Minor following Eero's input