update to split out adapters