Added feature 8c.
Added feature 8d.