add comment and fix adapter