Added modifications after pass through paper.