[feature] Integrated Donna's changes