These changes might be unnecessary