[IMP]impprove the code