updated with text link and advance logic