Editted some code