Update for the rest
Merging with intro