Updated based on QE feedback