Some changes to make it work again