fire lighting done
merging