this PR shouldn't include the inline adapter