stylistic updates
add conditional logic to link capturing