Most updated changes of this code