Completed feature 6.