many updates to streamline our process