replaced with markdown and added jason's stuff