added handing of more options