Update some from 4/29/14 class