final changes with Han's project