Resolve #6 - Adapter