removed old
added hoard link
fixed merge