working golden version endtoend