changes to use OSS