Some changes to sponsor
Fix merge conflict