Made some counts variables instead of calculated