[feature] little improvement (commented now)