changed structure of options. add before-after strategies