Some changes to abstract using Alex's feedback.