Code changes from session 10/13/2014