mher: Hopefully final version. Everything should work.