Updated some code

July, 9, 2013