99.99% Done :) Missing to update DB