Backend part1
conflict resolved