start of options support
changes