system upgrade

(automatic norm calculation not included yet)