Sixth class updates