Updated Logic and refactored DNA