Full update of code