Updated for newer versions of Ubuntu