Tidy up
Upgrade components