added adapter functionality
merge commit