abv table calc improved