working code with e2e feature