Okay, should I make these changes in this PR??