Revisit usage of overwrite_x parameter
#185
+201
−578
Merged