database task in new branch need debug
fix where condition
changes in branch