modifications to zhang shasha and switching computer