minor changes to the adaptor