final ch05 updates (from Jamie)