partly implemented fire functionality
fixed mergeconflict