I am not sure if this change is a good change