How to account for revaluation surplus in group accounts and goodwill

1) Parent acquired 75% share of S on 20X3 and there’s a revolution surplus in S’s SOFP as at 20X6. Only the info on retained earnings and FV of NCI at acquisition are given in the question and we are asked to calculate the goodwill by using the S’s 20X6 SOFP.

Do we include that revaluation surplus in goodwill calculation or are we to ignore it by assuming that it must have happened after the date of acquisition?

2) In the consolidated figure for revaluation, do we only include Parent’s share of subsidiary’s post acquisition revaluation and the parent’s own revaluation?