worked more on restructuring/db update