Proposed change for smoother transition