porting to pulsar 0.8