Added a better way to manage the change