some mostly additions for Pulsar's sake