[FIX] Some updates. Not yet completed.