changing to work with ubuntu