318 rebuild/upgrade

I'm with Moper on tis.