david's morning changes
kevins last min changes
final submission for ispa 2013