Update : code is desgined