Try to combine the stuff from wolfgar with master