Ting-An's initial changes