Some fine tuning and extra mode added