changes added by schwesti