modified Adapter