Commiting Han's changes