advancing version.  issues remain with when component, need to add a better test approach & automation