Some changes for the new version