I think i have not sorted out all bugs created from modifying the db tables