switched to active model adapter