Updated for other specs