Disregard...More options added

Please disregard this request.
I realized the code should be refined further.

Daniel