Rebase and readded tweaks