try to do a better fork
merged - Option updated