modifying to streamline further