updated messaging, and added some adapter