20131031: Lab8 updates