Updated with latest version of website + markdown