[FIX] Some changes added.