Client wants to amend plan to provide for the 3% non-elective safe harbor (no deferral requirement) and then match 50% of deferrals between 3 and 5% for an additional 1 % "safe harbor match". Is there a way to design the safe harbor so that both pieces qualify as safe harbor contributions? The regulations have an example with a discretionary match, but client wants to fix the match formula into the plan.