redesigned to run on new systematics