changes from demi and ardanis for next version