updated with changes from nextgen