Update code up to last modifications