Upgrade to A category teacher