Changes on code