Some changes for it to work