Rebase sg

Should it?