updated for zipline