mithrandir added some stuff