reworked flow for mva selection