Changed a little on the code.