updated for new aris api
resolved outdated conflicts