D601 Plan with Bob's design changes