followed more suggestions from the analysis thingie