Updating Malinda's modifications.