Updated to full recognition