[FIX] Typing Errors In The First Part
[FIX] Typing Errors In The Second Part