both formulas corrected and views adjusted