Commit
Merge + Some changes