Large overhaul to meet new requirements