Reworked preprocessing to work with OT 2.0