Worked on updatelist (Not yet tested)