hard copied sergej's changes