some modifications in decollector