a lot o changes and new features