Update Conditions

Update links, reorganized sections