remake to apply the change