working on new options
Ehh3
merge