DB logic change (try1)