I've changed these as requested.