overwriting master with Cheng's files