repaired design to match new requirements