Start of modifications