get kosar's commit !!!