[IMP]imporved code