Slight formatting change. WC logic still needs review.