Some changes in modifiers and rebuild