Modified Files for Zhang

There's a bug!