Updated challenge identification and alignment code.