move variable transformations to setup
final version submitted