New version, with underline functionality