Some changes
Fix after merge