brought changes from v2 of ABS version