Adding ABV and SRM calculations