Final Tested with DB. V2