Part two of changes