added options
merged version