Changes for nextgen