work-in-progress
Unfreezing dependencies