[FIX] Changes to latest status