Changes from CSLinux