update to follow new methodologies