Refactor to streamline Individual based on 'optimistic processing'