Centralized the changes