Updated with ubuntu stuff