Rebuild of PaulsMaster