Update the code to recent version