Updating to work natively on ubuntu