full code fix and DB