Update codes from the mid term presetation - deployed version