ZY's changes