updated to use new Aquarius framework