Fix after merging
big progress on dynamic load
merge