Changed: make doborn,doactive,dodie into different part