some changes with e2e