From Alex. Updates to Ex1 + Ex2