[IMP] further improvement