These changes are good. Keep these.