adapt diodon scheme change