Refactoring to use ubuntu