Updated Conditional Links