Some more changes per email