Major update - finished E-Rater scenario