changed the link parser and new option