Added changes from main wiki page