Some changes for modifications