adapted changes