lots of changes needed for ubuntu