Add reco'd changes from @codeschool-kiddo