Updated files from ubuntu box