Rebase sg

Here a refactor would be also needed in order to comply with our shiny new manager