Updated Jesse's contributions.