Added feature 8b.