Added both of them, and several new ones.