added rest of wiki