with some better ignition and fixing some problem