Some changes
Fixes merge conflicts