Added changes from ubuntu