complete redesign for the new systematics