Refactored to account for splitting.