New option added and polishing.