Modified to replace option name