MAjor changes and awesome additions