Modified Adapter