Built rebuild functions
Bug fix
Bug fix