review code
Jun13 2013 modified