Added comments
Adapt changes