some changes on 4/3/2014
some changes for this class on 4/3/2014