Updated for newer flavour of Linux