Updated to feature/dynamic_freeze