first version
fix bug & change value