Feedback is impossible until you make firm proposals/justification. What changes you want, why and how.
Reiterating a purpose and focusing on secondary issue of a swap is not a plan.