some efficency and stylistic changes after talking with Nan Yu