Final Update with DB
Final Update with DB