nick - class changes 4-23-13 2