Modified for Ubuntu 10.04