updates for a smoother transition