Brought all awesome new updates from Bagnon into Combuctor