hack-merged aris code into project