Working on E2E part1