change to new SDK and glue