Embed some new features and remove some stuff as well