[IMP]imporved code and labe