Start revise the code