Sync commit
Sync commit deel 2