Again improved Adapters