Han's changes