Adapted changes