up new code (mainly copy-paste)