Initial version with Ubuntu modifications