Just some minor changes as to how the adapters are invoked.