2013-03-25 modified general Class & general Method