Revert "Revert "Update 6""

This reverts commit e426e291ac28f5b13313bee2d9a722a20ae4f9df.