Added more ahri stuff not functional