Work on Auto Update Feature