Updated to use argv options