Merged Upi's progress on Adaptor.