retry
editing, trying to streamline