added abv % and non-image logic