More work mostly on db interaction