updated with lab8 11-5-14 @9