Big update preparations

Preparations for a big update.